Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Sat, 13 Feb 2010 08:15:10 +0000 (08:15 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Sat, 13 Feb 2010 08:15:10 +0000 (08:15 +0000)

Trivial merge